Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -1468,6 +1468,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
          *  blzd;//病理诊断-病理申请单选填',
          *  fixationfluid;//固定液
         */
        json.put("parentCode",inspectionDO.getParentCode()); //父节点
        json.put("code",inspectionDO.getCode()); //项目编码
        json.put("name",inspectionDO.getName()); //挂号流水号-必输
        json.put("information",inspectionDO.getInformation());//库房号-必输

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@@ -883,6 +883,9 @@ public class EntranceService {
                 *  blzd;//病理诊断-病理申请单选填',
                 *  fixationfluid;//固定液
                 */
                if(StringUtils.isNotBlank(vo.getParentCode())){
                    sbs.append(" parent_code=\""+vo.getParentCode()+ "\"");
                }
                if(StringUtils.isNotBlank(vo.getName())){
                    sbs.append(" group_name=\""+vo.getName()+ "\"");
                }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyInspectionDO.java

@@ -22,6 +22,9 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    private Integer quantity;//数量
    private String frequency;//组号
    private String parentCode;//检查检验父节点
    private String parentName;//检查检验
    private String code;//项目编码',
    private String name;//(检查方法)',
    private String groupName;//检查检验方法
@@ -249,4 +252,20 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    public void setGroupName(String groupName) {
        this.groupName = groupName;
    }
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    public String getParentName() {
        return parentName;
    }
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyHisPrescriptionVO.java

@@ -110,7 +110,7 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
     */
    private String diagFive;
    private String parentCode;//检查检验父级节点code
    private String code;//检查检验项目编码',
    private String name;//检查检验(检查方法)',
    private String information;//病史与体征',
@@ -419,4 +419,12 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setRealOrder(String realOrder) {
        this.realOrder = realOrder;
    }
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyInspectionVO.java

@@ -21,6 +21,9 @@ public class WlyyInspectionVO extends UuidIdentityVO {
    private Integer quantity;//数量
    private String frequency;//组号
    private String parentCode;//检查检验父节点
    private String parentName;//检查检验
    private String code;//项目编码',
    private String name;//(检查方法)',
    private String information;//病史与体征',
@@ -251,4 +254,20 @@ public class WlyyInspectionVO extends UuidIdentityVO {
    public void setGroupName(String groupName) {
        this.groupName = groupName;
    }
    public String getParentName() {
        return parentName;
    }
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
    public String getParentCode() {
        return parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
}