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

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

@@ -1469,7 +1469,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
          *  fixationfluid;//固定液
         */
        json.put("parentCode",inspectionDO.getParentCode()); //父节点
        json.put("code",inspectionDO.getCode()); //项目编码
        json.put("chargeCode",inspectionDO.getCode()); //项目编码
        json.put("name",inspectionDO.getName()); //挂号流水号-必输
        json.put("information",inspectionDO.getInformation());//库房号-必输
        json.put("checkEquip",inspectionDO.getCheckEquip()); //药品序列号-必输

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

@@ -868,7 +868,6 @@ public class EntranceService {
                }
                //检查检验
                /**
                 *  code;//项目编码',
                 *  name;//(检查方法)',
                 *  information;//病史与体征',
                 *  checkEquip;//类别',
@@ -880,7 +879,7 @@ public class EntranceService {
                 *  specimenNum;//标本数量-病理申请单必填',
                 *  ywjcResult;//以往检查结果-病理申请单选填',
                 *  ywjcDate;//以往检查时间-病理申请单选填 格式：yyyy-mm-dd',
                 *  blzd;//病理诊断-病理申请单选填',
                 *  blzd;//病理诊断-病理申请单选填'
                 *  fixationfluid;//固定液
                 */
                if(StringUtils.isNotBlank(vo.getParentCode())){

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

@@ -111,7 +111,7 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    private String diagFive;
    private String parentCode;//检查检验父级节点code
    private String code;//检查检验项目编码',
//    private String code;//检查检验项目编码',
    private String name;//检查检验(检查方法)',
    private String information;//病史与体征',
    private String checkEquip;//类别',
@@ -300,13 +300,13 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
        this.frequency = frequency;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
//    public String getCode() {
//        return code;
//    }
//
//    public void setCode(String code) {
//        this.code = code;
//    }
    public String getName() {
        return name;