Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2 - Milestone 1&2 Mapping #354

Merged
merged 104 commits into from
Mar 22, 2022

Conversation

shashanknarang27
Copy link
Contributor

No description provided.

shashanknarang27 and others added 30 commits September 23, 2021 10:54
This reverts commit 7689489.
* ADT_A02 template

* pushing testfile

* Revert "pushing testfile"

This reverts commit 7689489.

* Phase-1 , Milestone-1 all HL7 and template message

* Added ADT_A60 test case

* Added original ADT01-23 message in smaple data

* FunctionTest.cs failure issue fix

* Added Provenance "div" & new expected json

* Removed CodeSystem files

* Fixed UnitTest and FuntionalTest failure

* Expected value 834 updated in Templatecollection

* Added expected no for unused segment

* Updated RuleBase and FT expected json

Co-authored-by: Pulak.Roy <Pulak.Roy@xoriant.onmicrosoft.com>
@shashanknarang27
Copy link
Contributor Author

Hi @shashanknarang27, the unit test for checking the number of default templates was fixed (#360). Could you please try to rebase this branch to latest dotliquid branch?

@yankunhuang-pku : We have rebased the branch to latest dotliquid branch

@yankunhuang-pku
Copy link
Contributor

yankunhuang-pku commented Mar 18, 2022

Hi @shashanknarang27, the unit test for checking the number of default templates was fixed (#360). Could you please try to rebase this branch to latest dotliquid branch?

@yankunhuang-pku : We have rebased the branch to latest dotliquid branch

I think we can change the target branch from the branch hl7v2templates/phase2 to dotliquid now.
@shashanknarang27 Could you resolve the conflicts?

@yankunhuang-pku yankunhuang-pku changed the base branch from hl7v2templates/phase2 to dotliquid March 18, 2022 05:27
@shashanknarang27
Copy link
Contributor Author

Hi @shashanknarang27, the unit test for checking the number of default templates was fixed (#360). Could you please try to rebase this branch to latest dotliquid branch?

@yankunhuang-pku : We have rebased the branch to latest dotliquid branch

I think we can change the target branch from the branch hl7v2templates/phase2 to dotliquid now. @shashanknarang27 Could you resolve the conflicts?

@yankunhuang-pku : We have resolved the conflicts

@@ -8,7 +8,7 @@ By default, Liquid provides a set of [standard filters](https://github.com/Shopi
Besides these filters, FHIR Converter also provides some other filters that are useful in conversion, which are listed below.
If these filters do not meet your needs, you can also write your own filters.

### Hl7 v2 specific filters
### Hl7v2 specific filters
Copy link
Contributor

@BoyaWu10 BoyaWu10 Mar 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please double check about these changes? They seem existing in main, but not in dotliquid. I think we only need to include the changes in dotliquid, but not main.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it seems you merged the main branch? @shashanknarang27
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yankunhuang-pku : Before pushing the new code for Phase 2 mapping , we have fetch and merge the main branch in Xoriant/m1 and then add the new mapping code in xoriant/m1.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BoyaWu10 and @yankunhuang-pku : I will push the changes for the docs/Filters-and-Tags.md file

release.yml Outdated
@@ -9,6 +9,7 @@ pr:
- dotliquid
- main
- templates/*
- hl7v2templates/*
Copy link
Contributor

@BoyaWu10 BoyaWu10 Mar 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to make this change into dotliquid? I think we can remove it now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will remove this and push the changes

@shashanknarang27
Copy link
Contributor Author

@BoyaWu10 and @yankunhuang-pku : I have pushed the changes. Please review the same.

@BoyaWu10
Copy link
Contributor

@BoyaWu10 and @yankunhuang-pku : I have pushed the changes. Please review the same.

Thanks @shashanknarang27! The PR looks good to me.

@yankunhuang-pku yankunhuang-pku merged commit b6d5d2b into microsoft:dotliquid Mar 22, 2022
jakiefermsft added a commit to jasonheld-msft/FHIR-Converter that referenced this pull request Apr 26, 2022
…fer/pgcritiques-merge

* 'main' of github.com:microsoft/FHIR-Converter:
  Global Readiness Manifest file GeoPol.xml
  Update version (microsoft#375)
  Remove blank lines (microsoft#374)
  Update Doc for Filters  (microsoft#365)
  Switch FormatAsDateTime timezone handling to preserve to maintain consistency (microsoft#358)
  Revert "reset to local (microsoft#368)"
  reset to local (microsoft#368)
  Phase -2, Milestone-3 Mapping (microsoft#366)
  Change Default Time Zone Handling (microsoft#363)
  Turn on mac functional test check (microsoft#367)
  Fix warnings (microsoft#364)
  Fix Time Zone Bug (microsoft#353)
  Phase2 - Milestone 1&2 Mapping (microsoft#354)
  Add check for large for loops (microsoft#361)
  Updated the logic of checking the number of default templates
  Update pipeline win host version (microsoft#359)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants